使用Beyond Compare作为git diff merge 工具

1 直接修改.gitconfig 一般修改全局路径下的

1.1 Windows下配置

[diff]
    tool = bc
[difftool "bc"]
    path = C:\\Program Files\\Beyond Compare 4\\BCompare.exe
[merge]
    tool = bc
[mergetool "bc"]
    path = C:\\Program Files\\Beyond Compare 4\\BCompare.exe

1.2 Mac下配置

要生效的话需要在beyond compare 菜单中，选择 install command line tool 安装可在命令行调用的可执行文件

[diff]
    tool = bc
[difftool]
    prompt = false
[difftool "bc"]
    path = /usr/local/bin/bcomp
[merge]
    tool = bc
[mergetool "bc"]
    path = /usr/local/bin/bcomp

Using Beyond Compare with Version Control Systems
Git下使用Beyond Compare作为比较和合并工具

最后更新： 2022年03月02日 03:32

原始链接： http://rawbin-.github.io/dev-env/2016-01-07-git-beyondcompare/

赏